ISPN-4346

Some simple cleanups, and speedup some dog slow tests ;-)

https://issues.jboss.org/browse/ISPN-4346