Issue/sms mms vms tests cleanup

Some tests cleanups