Simpler test classes, fixed test module handling, better error reporting