Added tests and functionality related to results of moving to empty locations
merge conflicts