fix imports
add tests and allow continuations