Fixes tests
Updates Rakefile