Change examples to use new test package names