Remove empty constructors
Refactor arguments
Enable testing sources
Merge pull request #55 from fluxroot/2.2.x-improvements

2.2.x improvements