tests fixes for hack