Add unit, and obserable tests