Additional factory tests and update to PHPUnit 4.2