Added loading stuff to demos, and a test