Create unit test and made changes to the domain component