Fixes and updates to pass latest round of tests from @niklaka ProcessWire test suite.