Adding basic tests