Better HTTP mocking. Tests for PickpointApi. Some bugfixes.