Add ConnectionInfo template
Add test07Rename and test08Delete
zap trailing space