Switching test to handlers