CARROT-1015: follow-up - revamped tests and fixed build.