Use caption instead of a hack

The default template whites out the labels
Added test with real-case tables and captions