Merge pull request #160 from emilyhahn/master

CIDEVMI-1169 adcps_jln_stc driver
Merge remote branch 'upstream/master'
Updated some regexes based on testing and adding new test files.