Cleaning and refactoring Component unit tests