Unittests improvement