Moved over configurations for mocking.  Tests now work.