Partially implemented more tests.