Update tests to avoid intermittent test ordering failures