Samba test

Fix previous bugs