Updated UT and TestInputs