Allow more values
More tests
Correct PHPDoc
Correct PHPDOC
More tests