Fixes for unit tests with the latest manifest