Fix to block based test case