fix failing tests by using Linq .Single instead of .Where and .Select