failing test fixes
more cleanup
Merge pull request #2167 from mesutcelik/test-fixes

failing test fixes