Lock each method independently
Tweak order of struct fields in fakes