tests: cleanup
ConfigurationOptionsResolver: cleanup
cs