Split out unit tests