Fixed basic tests