implemented ResetToDemoData "TestCase"! (and fixed two small bugs)