Ninja-unify 1.1/1.2/2.0 system tests