corrected a phpdoc
cleaning up a bit in the tests
Merge branch 'feature_tests'