Activemq and old tests cleanup