ENH: Update test classes to comply with the new protocol