restructered test to reflect solution structur