Reworked all the tests so they reference variables as they are now configured in the main script, updated patternMatcher a bit