Fixing errors.
Fixed failing tests.