Fix #38 - remove unnecessary code, and undo changes to test.conf.js