Fixes for test cases