Test Suite Overhaul