however, we have failing test which looks a bit more complicated. Let's keep #636 open and address this separately.