FIX: Unittests for last commit