add support for one offset + improve tests