cleanup of last patch, fix typo in test name