WIP: Fix up the tests

PlayWS tests work at the moment for the enabled tests.
Apache HTTP does not.