#4137 Getting tests running again
#4137 Continue with tests