Commenting out jacked up tests
Merge commit '865c3fe' into thinkclay