Added multiple different components and test cases for them to main