Move unittests to proper unit
3 files changed