Merge pull request #1277 from spevans/pr_reenable_tests