Work on main.inc.php template and spec tests