Minor tests fix.
Minor AbstractBundleResolution refactoring.
Remove FIXME, allow relative paths
Cleanup of a few FIXME tags