Working through more tests.