Restore deleted tests
Merge apollo server generation