Improved the swap two variable testing