Added swap test & files to test search