refactor test new handler