Moving tests and code into the gem and adding gems