added tests for handlers