[#30] Improved Component used by tests (line wrapping and missing return)