Updated tests and Error.php