Fixing buil dissues with tests