Changed some spec tests