Use new hash syntax in Rakefile
More specific expectation for Match
Move every class in its own file