Fixed STS tests failing with IBM java