Updated to make mock and actual more alike, mock passes tests