GitLab

* Improve tests

* Improve TF tests

* Apply suggestion

* Fix test
Co-authored-by: Niels Rogge <nielsrogge@Nielss-MacBook-Pro.local>