Added our unit and acceptance tests