Improved markup utils and test