Move unit tests, round III