Corrected Rakefile for current Rake versions, removing deprecated tasks
Refactored the method names in the unit tests so these tests pass again