Update checkArgs and tests