Adding basic test situations and publishing
Merging from origin