Fixing tests

[merge]