A few test fixes
Merge branch 'pymc3' of github.com:pymc-devs/pymc into pymc3