Add global subscribers to reflect dispatcher and more tests