Added more unit tests for components