Cleanup columns-math with tests