Removed superfluos variable size1
Separated state_map_equal to a separate test
Added pointer dereference