Added generic testing helpers