fixed basic testing setup
Merge commit '539d9eccb519f0eb461f749da1ac7933fd2082f0' into 4.0