Test fixes
Added ms char as option
merged in dev