Fix folder erroring on links
Fix tests