Implemented more tests.