#26 temporary fix for some core classes. Added third test for database. Test fails. Need to resolve problem with deleting entities from collections after their real deleting