about code changed so hade to remove some tests