More files, types and tests