port mapping, datavolumedir, tests, small fixes