avoid import *, fixed unit tests