Merge "Add tests for RunningFgsController"