Update self-registering demo (also tests as working!)