adding changes for fixing test failure: weird test dependency problem