Adds additional tests for the new vue
js modal.

Minor test fixes

Fix broken jest tests

Minor rebase cleanup and some fixes
for broken tests.