Added Unit and Acceptance tests