Added helpers and helper tests