Create decorator with helpers and add first tests