Fixed failing tests - s9