add plan to subtest
Merge branch 'issue/901' into devel

Fixes #901
update CHANGES + version