Change port ID
Add test for creating queries