Fixing unittests based on previous patch for splitting