#26 temporary fix for some core classes. Added second test for database