Split unit tests into two