Starting to work on js tests and reworking ordering