Implemented more tests.

Implemented more tests.