Added more tests for ha