Bugfixes in one_to_one (multiple all finished emited from one_to_one)
and added corresponding tests