Added more tests.