Test fixes

A few fixes required due to changes in "teste" library.