Refactored tests to mirror /js directory structure.