Added Config file and made tests more robust.