Refactored rspect tests