modify imports and add helper func comments; delete redundant test