Move to Rspec for testing