Add more tests for subscription