Updated comments
Updated phpunit version to 4.2.*