More test coverage for handlers