Split unit test into two files