Fixing Starfield unittests