Simplified some iterations. Also testing out test class.