Add carrier and tests for it