More bug fixes, also ignoring test.conf as it's environment specific