Cleaning up some of the directive testing stuff.