Working on a phpunit testing issue, minor code cleaning.