Improved component tests
Implement component passing all tests