Fixed rakefile, fixed tests.