Added Caller tests, fixed a bug on error