Remove deprecated constructions
Handle dir(...) failures in tests
Make sure dir exceptions still trigger todos in tests