GPII-672: All tests now passing but three (commented out in all-tests.js)