Merge EnableConfigurationPropertiesTests

Fixes gh-168