test updated (patches to them accepted)