Ver Starr updated unit and acceptance tests