Add unit tests #4