Update tests for new directive names