Change filepaths to build correctly, split out multi module tests