API tests fixes moved from master
Merge pull request #196 from spawluk-bitbar/devel

API tests fixes moved from master