Merging smoke tests from ipclearance branch to master