Scabrero/samba fix tests