minor revisions to fix test failures in unit