Add better component and configure unit tests.