Fixed tests after fixing signature stuff