fixed file naming and touched up test components