More bacula client tests
Variables consistency
More refactoring
Merge branch 'refactoring'