... and add a basic test that would have prevented the regression Change-Id: I4c5f643ee291dcc1397ca951450459d8b8ad0bbd