changed parameters order of callX methods.
changed tests to fit last refactoring