- add additional test cases

- fix batch timestamp handling when timestamps are not specified