closes #685, fix some tests
Merge branch 'bugfixes/tokumx-1.3'