Directory sensitive testing etc, closes #12