Police on persistence layer.
Tests repaired.