Refs #99; Abstracted out data testing and fixed namespace issues.