Consolidated tests that were partitioned for performance issues