Soem test fixes