Fix entity server bug
Fix remove command integration tests