Fix tests pt. 1