Switch to Apollo 1.6 for functional tests, since 1.5 URL is dead

Fix unit tests for PR #22