Fix three test failures in complete suite