After merge. Unittests fix.