fixes params, refactor xctool-test