Fix - Fix tests