restructure test to be more consistent with original question