#26 temporary fix for some core classes. Some fixes in tests. They are broken yet