refactored file names, rspec config and consolidated tests to one file