All functional tests fixed!