Fixed some issues with the .inc file.  Also updated the test script.