Simplified the SystemControllerTests.