Little fixes in tests