Added support for colSpan in test
Improved testing module

Moved cell mapping to analyser module