Update/fix tests

[giovannipizzi]

The tests are not actually updated to reflect the current output of the tool. To be updated (choosing a few appropriate examples, and updating the expected test results accordingly).