Add extra component tests