Fixes for eval,  lo & hi rank, eval tests