Combine testing protocol/scheme
Better consolidation of tests