Adding Unit and Acceptance Test