Fixing tests file: mixed branches... =/