Add more comprehensive tests.