updated current tests according to changes in callback arguments order