Updated configuration tests
Merge origin/master