Use .assertEqual() instead of assertEquals()
Modernize code a bit