Updated tests.
Fixed more tests.