There is too much going on in the bin file. Please see this chore: https://www.pivotaltracker.com/story/show/65370914 We don't really want to be declaring an untested class in here. The others all look like that but I don't think we want to add new ones as it's introducing technical debt.