Move tests for handlers to be with handlers