Merge pull request #257 from kberg/auto-tests