Quarantining a couple more tests.
More test consolidation/reorganization.