Fixes after merge, mostly updated tests