Revert test cases to only test the basic queue

It's not necessary to test both Flash and HTML5 in
these instances - those tests should be covered in
their own individual test suites.
Merge branch 'dev-master' into dev-3.x