Some fixes in unit tests but they still fail :/