Fixing tests

Please, do not merge yet