test: update some scripts, clean up better