Refactoring interactions in JS test to be in .

Hopefully this will help isolate our testing inconsistencies better.