Updated extraction method and tests

original tests did not run, not sure if I'm mocking the right interface
If anyone knows you could save me a trip down the rabbit hole
tomorrow...