Add unit test

unit test updates with question rues

Ditto.