Merge pull request #603 from batkuip/develop

Fixed width calculation for grouped tablecells
Removed leftover test code