Added unit and acceptance tests for Eric Carrillo.