adjust test, eliminate cast