Added test, this damn thing works, I am not updating the states right