Some fixes in tests