Subscribe testcases and some core fixes