Fixing core unit tests