unittesting and small add to list changes
conflicts fixed