More robust build + utest hooked up
2 files changed