ISPN-2534 Some tests are not picked up by Surefire

https://issues.jboss.org/browse/ISPN-2534

Some of the tests needed updating as they got out of sync.
ConcurrentNonOverlappingLeaveTest revealed another issue - https://issues.jboss.org/browse/ISPN-2620.