Fix tests issue. Still doesn't understand them