Fix code for pass one of the PHPUnit test.