reorganized the Angular test files and components
resolved merge conflict in layout