Skip filtering out only online instances
Add more tests