Tests: Fix assertEquals deprecation errors
Tests: Remove dependency on unicode() or Py3 fails