rearranges test dependencies #23