sample for #68
sample for #69
fixes #68
replaced test of old format with new one, covers #68
resolves #69
tests for #69