Fixed all non-building tests. 2 tests fail at the moment, but vast majority pass without issue. Problems are associated with escaped characters in OK Script