Changes towards using Feedex and TestEx