Integrated changes into GenericPanel
Integrated into GenericPanel test