Updated the test handler to act like a man