fixes on several tests