Improve method names and add more specs

48 jobs for issue_20900 in 69 minutes and 17 seconds (queued for 1 minute and 33 seconds)