two files added by skronek and tweaks to clear all tests in entity, data, service and controller