Again, tests fixes