Updated tinder, added a test script, and cleaned up services.rb again