Included test for the FeatureSwitchService and also swapped the override map to before the closure rather than after