Started separating out components for better, more isolated tests.