Merge "Add testing features to devtools"