API refactoring
fee test fixed