Updated for new default test framework and added Gemfile

Conflicts:
	Rakefile