working on unit tests
Merge remote-tracking branch 'kpike1Fetch/master'