Cleaned delete tests up