Bug fix: the constants were being reprinted, losing formating. Added tests 15 and 16.