update tests + more cleanup