Consolidate the two tests