removed dir object, added tests