PHPUnit tests fixed. TODO: Update and fix commented tests