Improved Test Suite framework