Fix failing specs
Fix failing specs

When running dev key specs locally, on master, there are 2 recurring
failing specs.  The failing specs pass when run individually.

I refactored the specs so there was less shared state between spec runs,
which I believe caused the failures.

Test Plan:  Specs still pass.

Change-Id: I8b7e1201e9152663d3a97549768d932bb05e2a76
Refs: PLAT-3163
Reviewed-on: https://gerrit.instructure.com/141863
Reviewed-by: Weston Dransfield <e9203059795dc94e28a8831c65eb7869e818825e@instructure.com>
QA-Review: August Thornton <9adc7a1161ddf32ff608de792a7e50179545f026@instructure.com>
Tested-by: Jenkins
Product-Review: Stewie aka Nicholas Stewart <bec99285d8f1953757afca2af84365b0776c1eb4@instructure.com>

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