Fix the final tests and get grunt to stop f the javascript tests fail