consolidate tests