Major fix in tests