cleaned-up what was a mere mess of tests into a more solid architecture. more to come