Merge pull request #482 from haberman/python-fixes3

Fixed several more tests by implementing missing functionality