Update unittest

Merge into one Unittest App and Unittest Models