fixed var names
fixed expected output to fit new model