refactoring & beautifying tests for fee port