refs 48af4ab3a1 - updated test locations and component names - updated tests to use angle bracket syntax to match component usage
48af4ab3a1