Fix failing tests. No idea where this regression came from, seems we have a problem with mr.roboto.