Fixes to tests to match bug fixes in associated manifest