Updated terribad Test::Unit syntax to something more sane
Refactored support files