Merge pull request #345 from glee23/master

minor test tweaks