fix up, everything importable
add smoke test for imports