Adding basic test and rebasing