Revert "Merge branch 'feature/10398_missing_tests' into develop"

This reverts commit 655299e882b98bddb8efa5029c115bcca216ead0, reversing
changes made to 26064f2897b5151a5cdac644fc002394757d58bd.