Adjust constructor a little to make testing easier.
Add the minimal IT for that.