Clean up of configuration bits that are no longer required
Re-enable and update ConfigurationResourceTest