Domain and some test added