ticket 3: Solution with e2e and unit results