Added more tests with issues