Major fixes in test evaluation !!!