Fixed spec tests