Cleanup authenticator tests using statements