improved tests
cleanup