Fixed tests due to matryoshka core modification