Initial commit

Co-authored-by: Jiri Kuncar <jiri.kuncar@gmail.com>
Test coverage improvements