Merge pull request #252 from kberg/auto-tests