Updated Models & Tests