fix unit test errors. rename event. fix error offsets.