@xtream I think we should need an acceptance test for this