Better testing, remove stray leftover