Converted test to rpec #51, #52