Rephrase
Fixed tests