Update demo and test for justify support

Subject says it all.