add test to focal_payment and refactoring notification