Fixed help
Fixed tests