changed some tests and messed around with the cfg generation