Merge "Remove usage of unittest2"