TST: Make assertRaisesRegexp a contextmanager

+ small test fixups