Fix build output of adapter files and fix test includes following build dir change