Working version of new unittests