Added tests for Handler