Consolidate tests