Added unit and acceptance tests for Ivan Valle and Aizhuldyz Gabbassova.