Split out unit tests into two files. This time flipped correctly.