Added more clears near skiptests