Added extra rspec and continued refactoring