Added more helpers with tests