Add two tests to the test suite

Submitted upstream as well.
Remove unneeded annotations in some operations