Added some testing structuring. Brainstorming, mostly.