Impersonator properties and some simple cleanups
Add some assertions