I've rebased my branch. Tests passed.