fix bug in evaluation, add to test capabilities