Updated to use Apollo 1.7 for the unit tests