rm accidentally committed files, add test, fix import problem