tests + clean up