Fixed unittests and config