New entities added. Fixed existing entities. Test fix