Refactoring to split up spec file into method specs