Build improvements for Simpletests.