tests from kw
cleanup