ISPN-3463 Ensure persistent data removal before or after the test

I hope this makes the test suite more green

https://issues.jboss.org/browse/ISPN-3463