Refactoring of binary characteristics and their tests.