fixed testing flow
cleanup