Fixes for broken test cases