Fixed failing tests, ensured reverse compatibility.