Move DropCreateAlways logic to Initializer class
Add a lot of unit tests to check entity states