Update encryptiontestv2.py

Now the IV is derived from both the salt and master key. Plus added wait periods.