Fixed some inconsistencies, improved food moving test