Merge pull request #178 from kberg/tests