FEATURE payment in advance renameing decorators and improving tests