and here are (the rest of) the test mentiont in the commit just before