Testconfig added.
Also added some minor changes.