Base path attributes on relative path

Also update tests