Fixes to identifier as integer
Rewrote tests to work with new identifier
Added EntityStore to tests to keep state between operations