Joe - Rename and tidy js tests