Split out unit test into two files