Refactor tests to allow for PDGExtractClosureTests

See #36.