reshuffeling the conf.json and adding tests

pulled and merged your stuff just now