config refactoring, more mocks, convert monitoring locations to jaxb