Updated code and sample files to allow for "off-line" testing