Fix JavaScript tests
Fix JavaScript tests

Partially reverts 91e7c54 and selectively applies changes

WikiWatershed/model-my-watershed,WikiWatershed/model-my-watershed,WikiWatershed/model-my-watershed,WikiWatershed/model-my-watershed,WikiWatershed/model-my-watershed