fix test cases
more compilation errors fixed