Unittests changed
* Base class introduced
* code coverage increased