Moved Configuration to models, added tests