Other set of tests adapted so they do not result in errors when used
with PHPUnit