add tests and fixed params