Beautify
Fixed tests