added SimulatedAnnealingSwapTest, tests refactoring