Add integration tests and fix domain mapping