Tests issues fixed