Appready

Robustify some testing thingums.