fixing test cases, progress