More unit tests for handlers/