Add SUT and improve test.php