Remove unused helpers
Add integration test for server engine