Add unit tests & typed collections