AppHarness - moved to tests
Updated Controllers