Minor changes to make PHPUnit tests work