Added testing helpers