spec: combine two tests
spec: combine two tests

combine tests to speed execution and simplify manual testing

Change-Id: Iaee836854f9d2bfd534bea987c9c501ff519f47c
Reviewed-on: https://gerrit.instructure.com/126927
Tested-by: Jenkins
Reviewed-by: Heath Hales <8ca81b68c7e2592ac614bd07f22fcc735ca55f93@instructure.com>
Reviewed-by: David Tan <6283e310a2278fc51bdc4fb5974f70dd9c3366b9@instructure.com>
Product-Review: Robert Lamb <bf934bf7cdbebe5899399a138c0cb75c4d783999@instructure.com>
QA-Review: Robert Lamb <bf934bf7cdbebe5899399a138c0cb75c4d783999@instructure.com>

sfu/canvas-lms,instructure/canvas-lms,instructure/canvas-lms,sfu/canvas-lms,instructure/canvas-lms,instructure/canvas-lms,instructure/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,instructure/canvas-lms,sfu/canvas-lms,venturehive/canvas-lms,djbender/canvas-lms,instructure/canvas-lms,venturehive/canvas-lms,venturehive/canvas-lms,venturehive/canvas-lms