Move testing helpers to testing helper module.  Fix names to follow naming convention.