Refactored test suit helper