Fixes to work with Rivets tests
Update tests to use better method overriding

Using method overriding to better handle missing methods in python 2.6