Moved evaluation to SilkContext
add comment
rename
Fix test case