Fixed failing tests - functional