- fixed unittests and made settings flexible