Major redesign, tests so much more readable