Fix test paths and another attempt at targeted builds