Addng unit and acceptance tests