Merge pull request #26 from JonathanO/master

Minor test config changes.