simplify (greatly) Identity model
change mock hashes