Adjusted JS and Tests