Add a test and a fix for the __of__ issue @davisagli reported. Only tested under Python2 because I couldn't figure out how to reproduce it under Python 3