Fixing boundaries-tests.js and streamlining