Add more tests
Created originally on Bitbucket by Endre Karlson
Was already merged in Bitbucket before import, marked as merged by the import user
Created originally on Bitbucket by Endre Karlson
Was already merged in Bitbucket before import, marked as merged by the import user