Fixed failing tests...