fixing minor test failures