Added tests and fixed missing <testcase> issue