Change Several Bunk Tests