Add helpers to make indeed usable for testing