Update Rakefile with tests
Organize tests