Made tests better

They pass, now.