Beautified
Fixed tests