changed assertEquals to assertEqual
Merge branch 'feature/custom_adminsite' into develop