add comments
add not found tests (to prevent future regression)