Change method signatures to make them equal
Update tests