Use dist folder again!
Fix tests