change settings and add tests