Adding unit and Acceptance Tests