Tests fix, adress and customer should work
Merge origin/master