Fixes for passing tests for latest updates