Finished entity import and test import, removing acme demo bundle.