Config fixed, added some tests