Add some helpers for better testing
0.3.3