Tidy
Fixed tests