Move test.php to demo.php
Better exceptions
Add testing