Moving test
Adding dto layer