Moved tests into tests folder and out of sub-namespace
Updated phpdoc
Parser fixes