fix test
Merge pull request #548 from claymccoy/fixJsTestFailureDueToBadMerge

fix test that failed due to a bad merge