Extend test to catch the last bug