adding tests + clean up