Logic order correction
Merge branch 'features/more_tests_and_test_improvements' into driskell_codec_implementation_multiline