Merge "Tests: Provide clearer error when config is accessed via unit test"