I think at least one or a combination of these methods will resolve my qualms with how it's arranged right now. Thank you very much.

Edit: It is worth noting that I'm trying to keep the unit tests independent, however.