Improve tests for Python 2 & 3 compatibility