refs #59 Enhance tests