Remove __super__ reference
Restore removed test