Fixed already working tests