re-factored Configuration tests, class and calls