checking in the fixes for the tests which were failing. for all 8 tests