A few fixes after last merge

Mainly tests fixing