Reverts changes to be split into feature/additional_tests_part2