Fixing some tests - work in progress.
Merge branch 'master' of https://github.com/rafolo/rafolo