fixed unit test and setting