Add a few things driven by TestML