EAP6-18: Removed test code