Split out unti tests into two files