Fix those tests