CFY-1743 add decorator to specify that riemann should be cleaned up when...

... the test is over