Fix for missed merge conflict. For #7.

Always run tests after merge.
Always run tests after merge.
Always run tests after merge.
Always run tests after merge.
Always run tests after merge.
Always run tests after merge.