Fix the Spec and the test