more tests cases, refactor to not use import from