I'll revert it...
I always try to make testing as easy as possible few newcomers, this change may make the code a little uglier, but then things like ruby xxx.rb/running tests from some crazy editor etc just work.