Move methods and rename file so it is run by rspec