Add finishCheck and tests