Rearranging some of the test parts

Yes.. I realize I don't have everything under test yet.
Added Particle Swarm Solver