Add test coverage for new fee scheme and refactor old tests to work with new scheme
Attach a file by drag & drop or click to upload
