NAS-2384 Fixed some more tests, temporarily disabled som error tests