Unit test reactivated (and fixed)