Prepped the app model for more demos, cleaned up test cases