Edited Rakefile and Testhelpr