Change JS and Tests