Additions to test.php