cleanup
get canned tests working