Fix up latest js require paths
Fix commercial test spec paths