Added js tests and changed to view models.