Starting unit test with new classes.

TBC
Unit test done and stable