Make spec tests pass