Fix JS tests
Fix latest merge