More helpers and test