Correct spec test issues