minor changes

minor changes + longer test
Merge pull request #648 from bquistorff/master

minor changes