Adding testing for evaluation