Fixing tests #375