Build improvements for Simpletests.

What AD stands for?