Updated test based on Rob's suggestions