Updated method parameters and tests