Separated Settings and Added Test Cases (unittest)