Testing of Swap also added