first batch of tests + bugfixes for Moving