New tests + more cleanup