more tests and name arguments for caller
small simplification