Fixing customer tests