cleanup to use simplified test handler - all tests passing