Re-org common tests