Extracted current User to an argument resolver and refactored all the cases it was used. Then added test cases for said refactorings