Make test framework use new format of Player#do_gain
Fix bugs with new-style Player#gain