Updated schemes for new testing framework