updates to evaluation - started testing