Refactoring and LPF testing