Finish Python 2 integration with working tests