rebase preparation
implemented basic unit test