Fix old-style path to include type properly :)
Add regression test
Fix regression test bug :)