Move unit tests into own dir
Split unittests into 2 files