added Unit and Acceptance tests