Refactor and adds pending tests on the domain 
setup story