Minor cleanup of some directive unit tests