Fixed several tests