dead code removed
rearrange tests to document the approach