Fixed 2 test errors.
Fixed tests.