Test fixup

Attempt at fixing remaining problems causing test fails in dev release.