working on universal test, fix to lattice test too