Fixing merge issues to include an emulator of testharness.js