minor adjustments: refactoring directive tests