Added unoptimized version for xlist + unittests