Refactor, parameter testing