Moved and renamed unittests