some test env fixes