Uncomment sampling code, increase testing locations