Cleaned up directive testing