Added test button + minor changes
Merge branch 'master' of https://github.com/black-duck/sos