Add tests for default handlers