ticket:3 Solution with unit and e2e results