Cleaned and fixed tests.

All tests pass.