Split tests

Lots of cleanup. Now much easier to read.