Merge pull request #251 from kberg/auto-tests