Added Testing and Swaping Tasks