Forgotten dependency + Fix tests