Add SystemController tests