more tests + more test cleanup