Attempt to fix test conflicts with other tests