Fixed several tests.