Changed from self. to tm. for assertRaises per test_common.py