Fixed spec test failures