Code clean-up in tests for arithmetic task
Code clean-up in tests for binary task