Clean up some brittleness in the test suite
Simplify `rake test` execution a bit