add additional data
Add unit tests