Add more tests around downloadable cartridges

Fix minor backported issues that can occur with imported carts.
Merge pull request #4541 from smarterclayton/add_more_tests_to_emb_cart

Merged by openshift-bot