change test settings structure
remove unnecessary mock
fix typos