Merge pull request #458 from ndawe/master

[MRG] unit test fixes