Added some testing in evaluation