build fixes, testlibs updates