Yet another fix for auto-width columns + unit test

Hopefully with this unit test in place this is the last time this code needs to be re-fixed :)