add helpers and test