Unit and acceptance tests updated