Reverts changes to be split into feature/additional_tests_part2
Revert "Reverts changes to be split into feature/additional_tests_part2"

This reverts commit 1a7341eb4d47db8d5096a95c6c57acc2862791bb.