fix import and add 6 cases