Fixed dist process and tests