Fixed basic tests.