Improved unit testing and fixed column conversion issues.