Added some PHPDoc and Fix FinderTest
Added PHPDoc and some clean up