added test for #524

fixes #524
fixed test #524
Merge branch 'bugs/524' into bugfixes/tokumx-1.2
Merge branch 'bugfixes/tokumx-1.2'