Fixing `testHandler` weirdness

Cyclical referencing was causing all sorts of oddness