Adding spec helper, more refactoring