Fixed steps
Fixed tests§