Backport tests

@gsathya, this is a pull request to backport 2 tests from the summer version of Centinel. This has already been code reviewed and it works. Will you review/merge it?