#35 issues in test cases