these were renamed to notest or moved, but the originals weren't deleted