Fix for test run issue and review comments