Strip down test to simpler steps, smaller bites

Strip down test to simpler steps, smaller bites