Improved testing code
Better handling of a system without any s groups
Merge branch 'master' of https://github.com/fodder008/devo

Please enter a commit message to explain why this merge is necessary,