Add Configuration tests
Merge origin/master