Test functions and readme example tweaks.