simplify subscription test logic
add check to make sure we are getting the right type of messages