Add extended test, see #85