Work on unit tests
Work on domain updater