Extend is_package tests
Remove merge_path
Split out selector parsing