Fix tests, give option of location for callback on error