Now passing tests with all apollo classes in Apollo namespace