[1808] New tests included

https://gist.github.com/jakubjanuzik/4be61f3560ad14279a54