Update remaining scenarios to use Customer