clean up prereqs
update release tests
combine cluster::*