Code refractoring of smoke tests i.e. uncommented save verification code as it is now fixed and removing unwanted waits